Merge "Fix NPE in TextureView" into nyc-mr1-dev