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

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