[Backport to Xwayland 21.1] Couple of commits to fix issues in Xwayland 21.1

Couple of backports for Xwayland 21.1 (previous Xwayland standalone branch):

This adds:

• commit 288ec0e0 to fix #1110 (closed)
• commit 6ad6517a ti fix #1303 (closed)