Merge "Draw input field focus ring in WebTextView" into ics-mr1