Merge "Fallback to software rendering when eglMakeCurrent fails. Bug #3200621"