Cherry pick TextureView fixes
am: 2e8a8a2432

Change-Id: I0f650bf2647f9141f9639a4e8875170640d78237