Merge "Fix WebHistoryItemTest" into jb-dev