Merge changes I7a6b9db4,Ib579f580

* changes:
  EGLConfig is now not remaped to an internal EGLConfig
  remove multiplexing of multiple EGL implementation