Merge "fix animation bug" into lmp-preview-dev