Merge "Ensure AppWidgetManager is optional" into main