Merge "eglSwapBuffersWithDamageKHR robustness"