Merge "Fix Condition::waitRelative."