Merge changes from topic "am-e1b9190aa6cc406ea99b11d83e3cfbc5" 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: ab2722cd -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: e89140b0 -s ours