Cherry recent darwin Xorg / XQuartz changes into server-21.1-branch

Merge request reports