Merge "Fix NPE in TextureView am: 3c2587f26e am: 8fe31ec0e0 am: 2f072bae6e"