Merge "Use media switcher dialog to control routing during call" into main