Merge change 9391

* changes:
  be more robust when errors occur upon EGL surface creation (ie: don't crash)