Merge "End the trace section in FrameTracker#cancel if it has begun" into sc-dev