am d19e519f: Merge "fix another bug where screenshots could end-up all black" into jb-mr2-dev

* commit 'd19e519f673adcc5d12fcca549e577eea74f31aa':
  fix another bug where screenshots could end-up all black