Merge "Fix NPE in ApplicationExitInfoTest" into main