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

* commit 'e6dcf2651283d9237cabace60f208f9e45e6d7d9':
  Reduce unnecessary layout passes