am d080aa96: am e6dcf265: Merge "Reduce unnecessary layout passes" into ics-mr1

* commit 'd080aa96736aadf0ae4b6ffe69f5e4a34f3e379c':
  Reduce unnecessary layout passes