Merge "Revert "Revert "Fixed UserVisibilityMediator profile scenario.""" into udc-dev