Merge "Revert "GraphicsEnvironment: Fix ANGLE system driver selection logic"" into udc-dev