Merge "Fix behavior change for animators without a start delay"