Merge change 22105 into eclair

* changes:
  Add calendar sliding windows setting.