Merge "Fixing the population of ResolveInfo.userHandle in initial intents."