Merge "resourceloader: Fix-up missing expandRelativePaths() in preloadModuleInfo"