Merge change 22367 into eclair

* changes:
  Add calendar sliding window gservices setting.