Merge change 23375 into eclair

* changes:
  re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()