Merge pull request #121000 from passivestar/skeleton-editor-disable-sticky-tree