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

Change-Id: I320f641971f152773016aadbdbb01482593cbf87