Merge "Fix 'Add Bookmarks' button on History view crash"