Merge change 21057

* changes:
  Better error handling in EGL extensions