Merge "Fix timestamps after seek"