Merge "Use object id provided by working tree iterator for submodules"