am 7284c53c: am e68305d9: Merge "Handle egl context"

* commit '7284c53cfe1a4f21e487c4d312c4a5b685d82ffb':
  Handle egl context