Merge "Make the Next key navigate between TextViews" into ics-mr1