am 25b49734: Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev

* commit '25b49734cac1ecd17dba2af2a1af8328490236d4':
  Fix issue #8540550: Screenshots should never have transparency