Merge "Revert "Revert "APM: Avoid route change mute of isolated sounds"""