am 987f727d: Reconcile with jb-mr2-release - do not merge

* commit '987f727da2f90d428ae773a58cafc4ea67737aab':
  Improve screenshot performance on some devices (DO NOT MERGE)