Merge "SurfaceView: Revert SurfaceLock locking changes" into tm-qpr-dev