Merge "Use ResolveInfo for label and icon for LauncherActivityInfo"