Merge change 20643

* changes:
  Add calendar_sync_window_days setting to control calendar sync window.