Merge change I28023911 into eclair-mr2

* changes:
  Add additional error checking of EGL function calls.