Merge "Handle egl context"