Merge "SurfaceView: Synchronize visibility changes with VRI frame"