Some fixes from master which could benefit the stable branch as well:
- commit 74627d13 - xkb: Fix heap overflow caused by optimized away min.
- commit 95539ab3 - xwayland: Replace LogMessage with LogMessageVerb
- commit 5d73a8b5 - meson.build: KMS support also depends on dri2
