Fix activity merge collapse (#1600)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>

.github/workflows/main.yml

@@ -53,7 +53,7 @@ jobs:
         run: node common/scripts/install-run-rush.js bump-model-version
 
       - name: Building...
-        run: node common/scripts/install-run-rush.js rebuild -l --verbose
+        run: node common/scripts/install-run-rush.js rebuild -p 16 -l --verbose
 
       - name: Cache build results
         uses: actions/cache@v3
@@ -112,6 +112,40 @@ jobs:
 
       - name: Checking svelte sources...
         run: node common/scripts/install-run-rush.js svelte-check
+  linting:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Cache build results
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-build-results
+        with:
+          path: |
+            cloud
+            common
+            deploy
+            dev
+            models
+            packages
+            plugins
+            pods
+            products
+            server
+            server-plugins
+            templates
+            tests
+            rush.json
+            .prettierrc
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
+
+      - name: Linting...
+        run: node common/scripts/install-run-rush.js lint -p 16
   formatting:
     needs: build
     runs-on: ubuntu-latest
@@ -145,8 +179,15 @@ jobs:
           restore-keys: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
 
       - name: Formatting...
-        run: node common/scripts/install-run-rush.js format
-        
+        run: node common/scripts/install-run-rush.js format -p 16
+      - name: Check files formatting
+        run: |
+          echo '================================================================'
+          echo 'Checking for diff files'
+          echo '================================================================'
+          git diff '*.ts' '*.svelte' | cat
+          [ -z "$(git diff --name-only '*.ts' '*.svelte' | cat)" ]
+          echo '================================================================'        
   test:
     needs: build
     runs-on: ubuntu-latest
@@ -251,7 +292,7 @@ jobs:
           path: ./tests/sanity/playwright-report/
   docker-build:
     if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
-    needs: [ build, uitest, test, formatting, svelte-check ]
+    needs: [ build, uitest, test, linting, svelte-check ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -287,7 +328,7 @@ jobs:
       - name: Setting model version from git release...
         run: node common/scripts/install-run-rush.js bump-model-version
       - name: Build, to include new model version
-        run: node common/scripts/install-run-rush.js build
+        run: node common/scripts/install-run-rush.js build -p 16
       - name: Bundle
         run: node common/scripts/install-run-rush.js bundle
       - name: Docker build