Merge "pause/resume for Animators" into klp-dev