Merge branch 'master' into sivanova/combo-color-fixes

Author: SisIvanova

projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss

@@ -319,4 +319,12 @@
             }
         }
     }
+
+    %form-group-bundle {
+        &:hover {
+            %igx-combo__clear-button {
+                color: inherit;
+            }
+        }
+    }
 }

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

@@ -1791,8 +1791,8 @@
     %grid-cell--active {
         box-shadow: inset 0 0 0 rem(1px) var-get($theme, 'cell-active-border-color');
 
-        %igx-grid__filtering-cell,
-        %grid-cell-header {
+        > %igx-grid__filtering-cell,
+        > %grid-cell-header {
             border-inline-end-color: var-get($theme, 'cell-active-border-color');
             border-bottom-color: var-get($theme, 'cell-active-border-color');
         }