Merge "Timing::measure(): handle missing marks better"