Ensure main and fbsync are both in sync

[Nayef211]

Description

• Currently the fbsync branch is 172 commits ahead, 749 commits behind main.
• We want to ensure that main and fbsync branches are both up to date which is a 2 stage process
  1. Merge all commits from main to fbsync and resolve any merge conflicts ([MERGE 1/2] merge main branch to fbsync #1948)
  2. Merge all commits from fbsync to main and resolve any merge conflicts ([MERGE 2/2] merge fbsync branch to main #1950)