Merge "Trace dispatches for Lifecycle code" into main