[Xwayland-21.1] Backport fixes
This backports a couple of fixes for Xwayland 21.1.
Most importantly, this backports !751 (merged) which is required with NVIDIA proprietary driver Version 495.
This backports a couple of fixes for Xwayland 21.1.
Most importantly, this backports !751 (merged) which is required with NVIDIA proprietary driver Version 495.