Merge "Add title and icon in output switcher panel header"