am e5a4a3dc: Merge "Ensure we always set the proper blending mode Bug #6527305" into jb-dev

* commit 'e5a4a3dc1648844f06d29efd42c9306c3cdf177e':
  Ensure we always set the proper blending mode Bug #6527305