am 5ed8d666: Merge "Try to zero the EGL initialization count" into klp-dev

* commit '5ed8d6661a2be238af945839c037f3aa9a9870c4':
  Try to zero the EGL initialization count