Bug 988174 - Extract UI to edit bookmarks
Merge pull request #18016 from crdlc/bug-988174-v4

Bug 988174 - Extract UI to edit bookmarks