Merge "rework how we take screenshots for a CPU consumer" into jb-mr2-dev