am c894029a: am be29d82f: Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev

* commit 'c894029a8e398502c058c2f5332bfe75d4b01735':
  Correctly adjust clip regions that lie offscreen