Merge "Pass ProductId+VendorId+Source info to LatencyTracker" into main