Merge "Allow replacing ResolverActivity via config value" into klp-dev