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

* commit 'f70bc72c7ead448f50e2595369b7bba8aba8c544':
  Reduce unnecessary layout passes