Merge "onAccountsUpdated shouldn't be called back after listener unregistered"