Merge "Dispatch onAnimationStart and End to maintain proper state" into tm-qpr-dev