Merge "Refine layout for output switcher panel" into rvc-dev