Merge "Reset reverse state when an animator ends" into jb-mr2-dev