Merge "[Output Switcher] Update ui" into tm-dev