Cherry pick TextureView fixes am: 2e8a8a2432 am: 05cb60846c am: 2e5e9feaef
am: 726728d148

Change-Id: Ib6aab32895e76ab8da06141541c6e4c0f3340d6b