Merge "Ensure start delay is properly scaled with duration scale" into oc-dev