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

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