Merge "audio: Do not use StreamSwitcher for StreamPrimary" into main