Merge "New new design for ResolverActivity" into lmp-dev