Merge "Fix race when handling callback in SoundTrigger Module"