Merge "remove dependency on SurfaceTexture::connect()"