Merge "Make sure we have a valid EGL context before drawing Bug #9404946"