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

Change-Id: Id1946ed17449c07c5384c03c61fe5b9f0e5530f8