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