Merge "SurfaceView: positionLost locking fix" into rvc-dev