Merge changes from topic "am-74be07b89603414db401642981585c6a" into main

* changes:
  [automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-v2-dev am: 5428b1a1 -s ours am: 32db39c3 -s ours am: 6a2d0d36 -s ours am: 6ea510ab -s ours am: 6533908b -s ours am: d3c7aa8e -s ours
  [automerger skipped] Restrict USB poups while setup is in progress am: 68363246 -s ours am: 4f3d2a6c -s ours am: 1e865c93 -s ours am: abe6a8d9 -s ours am: e7571563 -s ours am: 1a45a220 -s ours