[Xwayland-23.2] Backport a couple of fixes
This backports a couple of fixes to address the regressions reported in Xwayland 23.2.0.
Edited by Olivier Fourdan
This backports a couple of fixes to address the regressions reported in Xwayland 23.2.0.