Merge "Deleted SurfaceControl.remove method"