Merge "Fix bugprone-use-after-move in ResourceParser"