devtools

Fix a few state management issues with the timeline.

#1962

Merged