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

Change-Id: I69af118cf8e8718fba5c7de1e3913e224a9983c7