Merge "Modify test and wrapper for ResolverActivity to run with async loading"