Merge "Fix bug with transform Animations"