Merge "Correct Audio System device unplug behavior on SAM and ARC"