Merge changes from topic "am-04f4129ee23c4c41b9638f2e0cc466ba" into main

* changes:
  [automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-dev am: bcfd8ebd -s ours am: 1ecab6ee -s ours am: abd3331d -s ours am: 85435f92 -s ours am: 2ab45c00 -s ours am: 853ca019 -s ours am: 0660af96 -s ours am: aec0256d -s ours am: 29ff3b97 -s ours
  [automerger skipped] Restrict USB poups while setup is in progress am: ec96cc3e -s ours am: f0af3edb -s ours am: f1fea109 -s ours am: 67522a0d -s ours am: ec7fcb18 -s ours am: d05a0599 -s ours am: 568f2de4 -s ours am: b050202e -s ours am: 71457245 -s ours