Merge "Fix potential overflow with casting long to int in AppExitInfoTracker" into sc-dev