Merge "Voice state + transcription in VoiceInteractionSvc"