Merge pull request #1447 from andozw/seana.20220422.avoid-storing-FinalOnionHopData