Merge "Expose an Output Switcher dialog for system routing" into main