Merge "Revert "Fix mute issue when changing audio routes""