Sync with GtkWorkarounds in XWT