Merge "Fixing leak in LauncherAppWidgetProviderInfo" into main