Merge "SurfaceView: Synchronize all surface view changes with VRI draw" into tm-dev