Merge "SurfaceView: Fix SurfaceControl synchronization issues"