Merge "Refactor Bookmark fragment, fixes NPE"