Merge "Applies a layer's color filter even when the layer is a quad Bug #7238059" into jb-mr1-dev