ngAnimate bug fixes

Closes #3587
Closes #3613