Merge "Fix ResolverActivity don't show items"