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

* commit 'e6a96560ed96e5121db2e22168698f14338c8f1d':
  Content and viewport rects set in one step.