Merge "Handle calendar sync state changes by observing Calendars; cleanup"