Restore scrolling to resource tree
Restore scrolling in Resource tree

Merge remote-tracking branch 'origin/pr/644' into pr/644

* origin/pr/644:
  Restore scrolling to resource tree