>
> I will fix this again differently after the Emacs 29 release, since the
> Cairo specific code there may be unnecessary altogether.

I'll surely test that when the time comes :)

I've found that living on master is actually quite smooth.