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

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