Merge "Copybara ❤️: Skip updating ActivityNodeFail's incoming node in the nodeMap if not found" into main