Merge "Unable to show correct device icon in Output Switcher" into rvc-dev