chore: extract merge from UC and simplify#4343

ledwards2225 merged 6 commits intomasterAztecProtocol/aztec-packages:masterfrom

lde/merge_updatesAztecProtocol/aztec-packages:lde/merge_updatesCopy head branch name to clipboard