Merge "Clean-up in TextView" into ics-mr1