Merge "Cherry pick TextureView fixes" into nyc-dev
am: 8eaa65b867

Change-Id: Iaf8ab16f6a1421ff6a19bf81a54b82111f6747f4