Merge "resourceloader: Switch params for private addLink() function"