Merge "SurfaceView: Fix SurfaceControl synchronization issues" into sc-v2-dev