Merge "resourceloader: Add test for non-empty user module in scripts-only queue"