Merge "b/2123477 Redesign of My Calendars UI."