Merge "[Output Switcher] Update device icon for dock device" into udc-dev