Merge "resourceloader: Separate context from extraQuery in ClientHtmlTest"