Merge "Added evenWhenDisallowed param to removeUserOrSetEphemeral()."