Merge "Fix bug 3175131 - listviews don't highlight properly"