Merge "Add app-side event lifetime tracing" into main