Merge "Replaced removeUserOrSetEphemeral by removeUserWhenPossible"