Merge "Consume TextureView matrix safely" into nyc-dev