Merge "Add AppStartInfo object handling" into main