Merge "Changed UserManager.getVisibleUsers() to return Set instead of List."