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

Change-Id: Ib8d633718cbbef9b8bf49e8afd4c77e57e8ebf9c