Merge "Revert change to correct animations." into jb-dev