am 81f9c799: am 2ea1045a: Merge "Applies a layer\'s color filter even when the layer is a quad Bug #7238059" into jb-mr1-dev

* commit '81f9c799241cea72214d1cdd0f139ef9ae80db66':
  Applies a layer's color filter even when the layer is a quad Bug #7238059