Merge "Fix bug 5116434 - Bookmark label is not highlighted."