Merge "Revert "Bugfix for accountsUpdated receiver in SyncManager""