Merge "Add animation to custom actions" into tm-qpr-dev