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

Change-Id: I8fe67cdd08a869ca53abdcc1a035bd3b64b0d0d1