Merge "[Shell-transition]: More checking animating state methods" into tm-dev