Merge "Fixing error in calculating translation animation."