Merge "Improve screenshot performance on some devices (DO NOT MERGE)" into jb-mr2-dev