Merge "Revert "Fixed UserVisibilityMediator profile scenario.""