[Merge] ~mfo/grub:lp1965983 into ~ubuntu-core-dev/grub/+git/ubuntu:master

[Mauricio Faria de Oliveira]

The backports for stable releases Jammy and Focal for this MR
(LP#1965983) are batched in branches of the Xen MR (LP#1987567).

https://code.launchpad.net/~mfo/grub/+git/grub/+ref/lp1987567-jammy
https://code.launchpad.net/~mfo/grub/+git/grub/+ref/lp1987567-focal
-- 
https://code.launchpad.net/~mfo/grub/+git/grub/+merge/429026
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/grub/+git/ubuntu:master.