Merge "TextViews keep focus after Done" into ics-mr1