Merge "Fix output switcher will display previous media session" into rvc-qpr-dev