Merge "Clean up delete widget functions in CommunalWidgetRepository" into main