Unshelved this merge from Stephan and then completed the merge with additional fixes and testing. Hand fixed some WorldExp compile issues due to changes to OnPaint() signature. #Integration [CL 2245992 by Daniel Broder in Main branch]