Merge "Fix for: NPE when intent.component set to ResolverActivity." into tm-qpr-dev