Merge "Fix issue with 0 duration animations"