Merge "[Shell-Transition] clean-up some isAnimating call points" into tm-qpr-dev