Merge "Fix output switcher will show 2 media sessions in some use cases" into rvc-qpr-dev