Merge "resourceloader: Support loading group=user modules with addModules()"