Merge changes from apertis/v2020-updates into apertis/v2020

debian/changelog

-xorg-server (2:1.20.4-1+deb10u3+apertis1) UNRELEASED; urgency=medium
+xorg-server (2:1.20.4-1+deb10u3+apertis1) apertis; urgency=medium
 
-  * PLEASE SUMMARIZE remaining Apertis changes
+  * Merge from Debian buster-security. Remaining changes:
+    - Disable glamor and glxvnd in xwayland to avoid Xwayland
+      depending on big GL.
 
- -- Apertis CI <devel@lists.apertis.org>  Wed, 25 Aug 2021 16:18:21 +0000
+ -- Ariel D'Alessandro <ariel.dalessandro@collabora.com>  Fri, 27 Aug 2021 16:57:14 -0300
 
 xorg-server (2:1.20.4-1+deb10u3) buster-security; urgency=high