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

* commit '1aa6b813c267953c19d029c4864f31db58992f98':
  Handle egl context