Merge "Remove SurfaceControl.destroy function"