Merge "resourceloader: Improve ResourceLoaderClientHtmlTest tests"