Merge "Fix UnfoldAnimationControllerTest" into tm-qpr-dev