Merge "Revert "Save generated previews in AppWidgetService"" into main