Merge "Fix crash when reset() gets called during an animation" into lmp-dev