Merge "Refactored Settings calls to removeUserOrSetEphemeral()."