Merge "SurfaceView: Synchronize position updates with fixed size changes" into sc-dev