Merge "Special case EGL_BAD_SURFACE" into lmp-dev