am 50f40bd6: Merge "Recurrence picker update" into ics-ub-calendar-cream

* commit '50f40bd6c1382b3b9c5fedf89639200706712e19':
  Recurrence picker update