Merge "Fix flaky test in ApplicationExitInfoTest"