Merge "Fix for: NPE when intent.component set to ResolverActivity."