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

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