Merge "Remove flicker from WebTextView" into ics-mr1