Merge "Proper EGLImageKHR error handling"