Merge "Fix issue where animation progress would be overridden"