am b107b7e9: Merge "Prevent TextureView from ever setting a null layer paint Bug #8760436" into jb-mr2-dev

* commit 'b107b7e9ecaee799a7a18b8ab897969ef554fd9b':
  Prevent TextureView from ever setting a null layer paint Bug #8760436