Merge "Correct trace name of LatencyTracker" into sc-dev