Merge "SurfaceView: Lock mDeferredDestroySurfaceControl" into rvc-dev