Gl extension desktop parity

Adding up for comments. Please only merge after #1688 (this actually includes #1688 as well).