Cherry pick TextureView fixes am: 2e8a8a2432
am: 05cb60846c

Change-Id: I63d23f6b28b40154952cee408e42115657e6a3e3