Merge "ResourceLoaderImage: Some cleanup, typo fixes and tweaks"