Merge "(Vector) Drop frames when the animation is delayed" into devel/master