Merge "Make sure we have a current EGL context when invoking EGL Bug #5081795"