Merge "Fixed UserVisibilityMediator profile scenario."