Merge "[Output Switcher] UI polish and A11y bug fix" into udc-dev