Merge "resourceloader: Run ResourceLoaderRegisterModules after wgResourceModules"