Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken