Merge "Fix flaky ApplicationExitInfoTest" into sc-dev