This is preparation work for Xwayland 22.1 that we should release early next year.
Basically, redoing the work which was done by Michel @daenzer for the first standlone release (hence the cherry-picks that apply).
Note: DO NOT MERGE, it will become a branch of its own one day!