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

Change-Id: If9cd882811348e94c53a2a5f471ab918c5e60c78