Merge "resourceloader: Add filter cache version to module version hash"