Xwayland 1.20 backports

This is to backport !203 (merged) to the stable branch.

Merge request reports