Merge "Refactored UserVisibilityMediator to use UserVisibilityType."