base

Merge change 22563 into eclair

* changes:
  fix a bug recently introduced where EGL couldn't be initialized again after it had been terminated once