Merge "fix SoundTrigger overwriting session identity"