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