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

* commit '453cfe0bfe06f3cbd87c8c42fa641756ab466b06':
  Improve screenshot performance on some devices (DO NOT MERGE)