[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.
Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.
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.