Merge "{Output Switcher} Update ui change"