Merge "Fix perfetto tracing of manual transitions" into main