Merge "Update output switcher behavior and UI design"