Merge "Refactor createAnimationParamsOrDefault." into main