Merge "resourceloader: Remove support for `addSource(id, url)`"