Merge "SurfaceControl: Remove setOverrideScalingMode"