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