Merge "Fix NativeCrashListener"