Merge "stop using a deprecated SurfaceTextureClient ctor"