Merge "resourceloader: Fix return type in ResourceLoader-related classes"