Merge "Use ResolveInfo for label and icon for LauncherActivityInfo" into ub-launcher3-master