Merge "Add tracing to FrameTracker" into main