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