Merge "fix EGL debugger"