Merge "Address memory leak in AppStartInfoTracker" into main