Merge "Resolver - Fix NGA (voice interaction) crash in resolver"