Merge "Fix broken FoldAodAnimationControllerTest test" into tm-qpr-dev