Chery-pick recent XQuartz changes back to 21.1
I made some changes while triaging an issue in XQuartz related to rootless and fb. Pulling some of them in where they are not intrusive.
I made some changes while triaging an issue in XQuartz related to rootless and fb. Pulling some of them in where they are not intrusive.