Merge "Invalidated bounds tightened in TextView" into ics-mr1