Merge "Cherry pick TextureView fixes" into nyc-dev am: 8eaa65b867 am: 25c6b37613 am: 24a082cd49 am: 8960d573f2
am: 2952597e7f

Change-Id: I2ffc729c026575b42787977e58a26ac94b13fa46