Merge "Fix SurfaceTexture leak in TextureView Bug #6318631"