Merge "Fix deadlock occurring on account add in SyncManager."