[backport to Xwayland-23.1] Various fixes

Merged Olivier Fourdan requested to merge ofourdan/xserver:backport-xwayland-23.1 into xwayland-23.1

Backports:

Edited by Olivier Fourdan

Merge request reports