Merge "Fix check for current EGL context" into jb-mr2-dev