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

Change-Id: I36308a0b1beb391a31fdad836ec6194cb048de4e