This MR aims at backporting a few (more) fixes to the (soon to be obsolete) xwayland-22.1 branch.
/cc @dkorkmazturk @ekurzinger @ajax @daenzer
