Merge "Group session MediaItems together in OutputSwitcher" into main