Cherry pick TextureView fixes
am: 2e8a8a2432

Change-Id: I1ae3cdc7181e9bef40e38204ede002de973dee98