Merge "Add dynamic item in output switcher if it is available"