Merge "resourceloader: Remove wfExpandUrl() from ResourceLoaderImage"