Merge "Fix potential negative duration in the ServiceState tracker" into sc-dev