Bug 988177 - Extract UI to remove bookmarks
Merge pull request #18171 from crdlc/bug-988177-v4

Bug 988177 - Extract UI to remove bookmarks