I'm resolving this as I've implemented an upstream fix for grub (merged), which has been already backported to the grub2 factory package. I'll resubmit xfsprogs for merging.