Merge "Fix a race condition in SyncManager.onAccountsUpdated()"