Merge "Add new api for output switcher"