Merge change 20365

* changes:
  oops, EGLConfig of value zero may be valid