Merge "Avoid negative JobRunner time stats"