Update control behavior to animate between positions.

Fixes #1698