Merge "Cherry pick TextureView fixes" into nyc-dev am: 8eaa65b8 am: 25c6b376 am: 24a082cd am: 8960d573 am: 2952597e Change-Id: I2ffc729c026575b42787977e58a26ac94b13fa46