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

Change-Id: I3509a305e78e3fe80fa236cbbab2bf0142931ff4