Merge "Reformat timezone name to better distinguish GMT from timezone. DO NOT MERGE" into ics-ub-calendar-cream