Ofbiz performance issue with ThemeFactory

If there are many products with images (images stored in the plugin or theme), the ThemeFactory blocks the frontend until all files are processed.

The problem is initiated in the following lines of code in ThemeFactory.java:

List<File> xmlThemes = FileUtil.findXmlFiles(themeFolderPath, null, "theme", "widget-theme.xsd");
        List<File> xmlPluginThemes = FileUtil.findXmlFiles(pluginsFolderPath, null, "theme", "widget-theme.xsd");

I think the search path should be restricted to the "widget" folder of the respective plugins/themes, as the theme.xml file should be located there.