Merge branch 'main' into feature/search-packages-android-device

Author: alokedesai

specs/git/rebase_master_into_current_branch.yaml

@@ -0,0 +1,16 @@
+---
+name: Rebase master into feature branch
+command: |-
+    git checkout
+    git checkout master
+    git pull origin master
+    git checkout -
+    git pull origin master --rebase
+tags:
+  - git
+description: Rebases master into the feature branch
+arguments: []
+source_url: ""
+author: Varun Jindal
+author_url: "https://www.linkedin.com/in/varun-jindal/"
+shells: []