Merge "Fix task animations"