Merge "Fix condition bug in ResolverActivity"