Merge "Adding support for customiting the animation in PropertySetter" into tm-dev