Merge "Reversing immediately after starting animator ends it" into klp-dev