Merge "Output Switcher shows "+" button next to some non-expandable device" into sc-dev