Merge "Fix per-keyframe interpolators"