Merge "Add ServiceManager tracing to AppStartup" into main