Merge "[Output Switcher] Update Volume control in Output Switcher" into tm-qpr-dev