Merge "Fixed UserVisibilityMediator so it doesn't suppoort invalid modes." into udc-dev