Merge "Properly offset time since setup when persisting."