Merge "Add cross protocol transfer support in output switcher"