Merge "[Output Switcher] Not add "Connect a device" option when output is remote" into udc-dev