Merge branch '8.2.x' into dmdimitrov/issue6257-8.2.x

Author: zdrawku

projects/igniteui-angular/src/lib/grids/grid-base.component.ts

@@ -2055,7 +2055,7 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
      * @hidden
      */
     public get parentRowOutletDirective() {
-        return this.outletDirective;
+        return null;
     }
 
     /**

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.ts

@@ -443,6 +443,13 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseCompone
         return this.rootGrid._outletDirective;
     }
 
+    /**
+     * @hidden
+     */
+    public get parentRowOutletDirective() {
+        return this === this.rootGrid ? null : this.rootGrid.rowEditingOutletDirective;
+    }
+
     /**
      * @hidden
      */