Merge change 26653 into eclair

* changes:
  make the SyncManager listen for backgroun data setting changes and do a sync when the setting is enabled