Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier