Merge "[Output Switcher] Refactor MediaOutputAdapter" into tm-qpr-dev