Remove the explicit highlight from the listview and use the highlight property on the delegate (cherry picked from commit b8516a32)