Merge "Changes after removal of Core::SurfaceResized()" into devel/master