Merge "Prepare to unhide SurfaceControl"