am 7b1f606b: am 1aa6b813: am 7284c53c: am e68305d9: Merge "Handle egl context"

* commit '7b1f606b8ca60f3b081a7ad7b9f7fe14716447c9':
  Handle egl context