Merge "Recompute visible regions more vigorously" into jb-mr1-dev