Merge "Revert "SurfaceView: Synchronize all surface view changes with V..."" into tm-dev