Merge "Improve animation timing." into jb-dev