Merge "resourceloader: Allow modules to be registered via a factory callback"