Merge "Performance improvement in TextView" into ics-mr1