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

* commit '9cb417b76fa72b3a53c6ce6d4017b389f553a2b8':
  Correctly adjust clip regions that lie offscreen