Merge "Throw for showSystemOutputSwitcher() call from privileged router" into main