Merge "Disallow overlays for ResolverActivity" into qt-dev