Merge "SurfaceControl: Allow calling destroy when mOwned is true"