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

Change-Id: I5511140fe1dca417b636aff2b4c3acdf1067da7a