fix(ngAnimate): correctly retain and restore existing styles during and after animation

Closes #4869
Merge branch 'master' of https://github.com/angular/angular.js
componentizd!