Merge branch 'release-3.1.1' into don't_expand_filters
keep track of expansion state and have collapsed by default
Merge branch 'don't_expand_filters' into timeline-3.1.1_fixes
Merge pull request #912 from millmanorama/timeline-3.1.1_fixes

don't expand type filters by default