Merge "Move mute/unmute handling to adjust volume paths"