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