Merge change 25177 into eclair

* changes:
  Fix for #2092883: Allow manual sync even when background data is disabled