Merge "Prevent TextureView from ever setting a null layer paint"