Animation Performance Fixes

Closes #3215
Closes #4011
Closes #4124