Merge "Integrating time zone picker into settings" into ics-ub-calendar-cream