Merge "Revert "When getting a widget provider by name, check all categories"" into main