Merge "Fix WebTextView rings" into ics-mr1