Merge "Track animating apps up until animation starts." into jb-dev