Fix highlighting after reselecting same word#1520

jeremypw wants to merge 11 commits intomasterelementary/code:masterfrom

jeremypw/rework-highlight-selectionelementary/code:jeremypw/rework-highlight-selectionCopy head branch name to clipboard