Always collapse an expanded kind without changing selected story#1590

Hypnosphi merged 2 commits intomasterstorybookjs/storybook:masterfrom

collapse-kindstorybookjs/storybook:collapse-kindCopy head branch name to clipboard