```
Can be reviewed with --color-moved=dimmed-zebra --patience
```
This is a move only change, no change in behavior.
Partial backport of [[https://github.com/bitcoin/bitcoin/pull/20864 | core#20864]]:
https://github.com/bitcoin/bitcoin/pull/20864/commits/fa0a71781a964d944db9ecc002675ef32249f62e
Depends on D10879.
Ref T1696.