Merge change 24820 into eclair

* changes:
  [Issue 2116081] Removing account's data from _sync_state when account is deleted