Thanks for this. I have applied the patch and published it.
For what it's worth, I tried applying a patch from someone else last month and couldn't get it working on my Linux laptop. It seemed like, at least on the version I was running, the workaround had been closed. I hope that this patch keeps working. (I haven't tried your version on my Linux laptop. After a terrible exchange with the Wayland devs about this issue, I gave up on Linux on the desktop for another few years. It is sad that they are the gatekeepers for the whole experience.)
Best,
Russ