Merge "rework screenshot API and implementation" into jb-mr2-dev