Merge change 26449 into eclair

* changes:
  Keep track of 'initial' sync state in SyncStatusInfo