ivy.el (ivy--highlight-default): Use match faces consistently

Fixes #2717
Fixes #2718
Re ##2080

Author: brownts

ivy.el

@@ -3982,7 +3982,8 @@ in this case."
               (let ((beg (match-beginning i))
                     (end (match-end i)))
                 (when (and beg end)
-                  (unless (and prev (= prev beg))
+                  (unless (or (and prev (= prev beg))
+                              (zerop i))
                     (cl-incf n))
                   (let ((face
                          (cond ((and ivy-use-group-face-if-no-groups