Merge "Check for initialized EGLDisplay when required by specification"