Merge "[2/n] Makes EduAnimationController generic" into tm-qpr-dev