Merge "Resolve bug where rotating device was losing event view state." into ics-ub-calendar-cream