Merge "onUpdateAccounts fix for SyncManager"