Merge "Content and viewport rects set in one step." into ics-mr1