Fixes thumbnail scrolling jumps
Merge remote-tracking branch 'origin/thumbnail-click-jump-fix' into thumbnail-click-jump-fix