Upstream fixes introduced in qemuarm/64-efi support

Description

!250 (merged) introduced a good set of fixes that are targeting upstream components (grub, edk2, etc). We should upstream them so we don't have to maintain them locally.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information