Merge branch 'dangoor/9225-highlight-not-switching' into dangoor/9327-endless-scroll
Fix endless horizontal scrolling in the tree.

Fix for #9327.
Merge branch 'master' into dangoor/9327-endless-scroll
Merge pull request #9378 from adobe/dangoor/9327-endless-scroll

Fixes endless horizontal scrolling in the file tree