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

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