Merge "Fix calendar sync_account / type constants to be consistent."