Merge changes from topic "am-024503fe6dda429ca9f37b0e8482a58a" 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: 946ef5c0 -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: 34859585 -s ours