Merge "Add a flag to enable/disable/configure LatencyTracker"