Merge "Recurrence picker UI re-design" into ics-ub-calendar-cream