Merge "Revert "Sync SurfaceView position changes to parent render.""