Merge "Cherry pick TextureView fixes" into nyc-dev