Merge "[Output Switcher] Add suport for subtext and ongoing session"