Merge "Fix Transaction tracking for FrameTimeline" into sc-dev