Merge "resourceloader: Add filename to validateScriptFile cache key"