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