Merge "Fix NPE in TextureView" into nyc-mr1-dev
am: 4804404e11

Change-Id: Iab6ecc3b6a5bf9d8921297dec9a0f93ff1abc397