Merge "Resolver - Fix NGA (voice interaction) crash in resolver" into qt-qpr1-dev am: 636ae6a386
am: 9621fa911d

Change-Id: I4f1de19efa02127dea21b945e18078da8b090b2e