Merge "Expand user control over the output switcher"