am e68305d9: Merge "Handle egl context"

* commit 'e68305d9c0ffdb5f99a1b9c62618825bb526e4c4':
  Handle egl context