Merge "Actually end animators on tree destruction" into lmp-dev