Merge "Don't recreate the EGL surface if the surface is not ready Bug #5114545"