Merge change 22257 into eclair

* changes:
  first step for fixing [2066786] EGL object lifetime management doesn't respect the EGL spec