Merge "Fix flaky ScheduleCalendarTest"