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