Merge "Fix pause/resume timing"