Merge "Fix off by one error in timestamp jitter calculation"