Merge "SurfaceTexture: fix a test deadlock"