Merge "Split Surface/SurfaceControl fallout"