Merge "Fixed an animation bug" into lmp-preview-dev