Xwayland cleanups

Merged Adam Jackson requested to merge ajax/xserver:xwayland-cleanups into master

Merge request reports