Merge "Fix SystemAudioInitiationActionFromAvr state switching."