Merge "Add flag to gate MediaSession-less output switcher" into main