Merge changes from topic "am-3fa059c5e08e486eb634ca39e55eb2ee" into main

* changes:
  [automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: 40d8b4cf -s ours am: 475a4237 -s ours am: 1e9c5024 -s ours am: a3b5bd3b -s ours am: a4c739cc -s ours am: 99f73180 -s ours
  [automerger skipped] Fix settings activity showing background bp when am: 5ce5bdd5 -s ours am: 8aeac421 -s ours am: cd87ea17 -s ours am: 04526580 -s ours am: f1fef1f0 -s ours am: 21fe0ed5 -s ours