Merge "Resolver - Fix NGA (voice interaction) crash in resolver" into qt-qpr1-dev