Need to use multiboot2 while booting Xen under EFI, and not multiboot as is used when generating grub.cfg with grub-mkconfig.
Backport commits included in upstream Grub 2.04.
Diskless setups are not affected, as grub.cfg is generated manually by the mkimage scipts.