Merge "Refactor OnUsersUpdateListener"