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

Change-Id: Ib41200ab378bce6c65a40364cf39c78a0b9942e9