Merge "[Output Switcher] Fix volume adjustment metric logging" into tm-qpr-dev