Merge "Reduce unnecessary layout passes" into ics-mr1