Merge "Fix not animating icons" into tm-qpr-dev