Merge "SurfaceView: Fix overlocking of mSurfaceLock" into tm-dev