Merge "Add ServiceManager tracing to post boot trace" into main