Merge "Renamed removeUserOrSetEphemeral completely"