Merge "Resolver - Improve flow for Intent URL handling" into qt-dev
am: d73543b588

Change-Id: I158e33705154e00fae20c29ebb7177877beae655