Merge "Callers of ResourceLoader::getModule should check for null return"