Merge "attempt to fix a deadlock in SurfaceTextureClient::disconnect"