Merge "Correctly populate title for ResolverActivity" into lmp-dev