Merge "Change getBadgedLabelForUser to use CharSequence" into ub-now-master