Merge "Use isInTransition() to detect animations" into tm-dev