Right, these patches have been applied only to the Ubuntu packages at this point. Partly because I’ve not yet assessed how broken this is upstream, and partly because feature freeze for Eoan is around the corner.
I will need to do more testing against upstream’s own packages, as well as on Debian to determine what proposals are needed there.