Merge "[Output Switcher] Fix layout for ongoing session" into udc-dev