Cherry pick TextureView fixes am: 2e8a8a2432
am: dbf69818a2

Change-Id: Ia3924a4fa600611bbce966c327d563c67c5b4779