Sync with master branch

Change-Id: I55d81f25f80147cdfcbe9681ffc09a1022b3c28d
diff --git a/mbed-tls-framework-restricted-multibranch.yaml b/mbed-tls-framework-restricted-multibranch.yaml
index dcbce86..38d570f 100644
--- a/mbed-tls-framework-restricted-multibranch.yaml
+++ b/mbed-tls-framework-restricted-multibranch.yaml
@@ -44,7 +44,7 @@
         discover-pr-forks-strategy: both
         discover-pr-forks-trust: nobody
         discover-pr-origin: both
-        head-filter-regex: 'PR-\d+-head|gh-readonly-queue/.*'
+        head-filter-regex: '(?!^PR-1-(head|merge)$)PR-\d+-head|gh-readonly-queue/.*'
         status-checks:
           skip: true
           skip-branch-source-notifications: true
@@ -52,9 +52,6 @@
           all-branches:
           - pipeline-branch-durability-override: performance-optimized
         submodule:
-          disable: false
-          recursive: true
-          tracking: false
-          parent-credentials: true
+          disable: true
         ssh-checkout:
           credentials: mbedtls-github-ssh