Merge "Implement per-display EGLConfig and configless EGLContext"