Merge "Cherry pick TextureView fixes" into nyc-dev am: 8eaa65b867 am: 8f0de55375
am: a6a95328dd

Change-Id: I2c7bde569f077f21125927dc66d5aa2e8b41fe81