Merge "resourceloader: Move add() outside loop to optimise sortDependencies()"