Merge "Handle failed AppStartInfo record write" into main