Merge "Clean up span calculations in LauncherAppWidgetProviderInfo." into ub-launcher3-master