Merge "Change handling logic in SystemAudioAutoInitiationAction"