Merge "Cherry pick TextureView fixes" into nyc-dev am: 8eaa65b867 am: 25c6b37613
am: 24a082cd49

Change-Id: If6a1ad186ce66d68fb79a2a5c0dc217c7161cac8