Merge "Fix lastVisible/global rects" into ics-mr1