Merge changes from topic "am-7d139dafc330447eb727d4664cb852da" into main

* changes:
  [automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: 640a584e -s ours am: b2ff727f -s ours am: 02bd34ec -s ours am: c9bac9e1 -s ours am: 13844b30 -s ours am: ad959e4d -s ours am: 96073206 -s ours
  [automerger skipped] Fix settings activity showing background bp when am: 41261135 -s ours am: 7b6ab415 -s ours am: 59f7b382 -s ours am: 7e487545 -s ours am: 8a7073b3 -s ours am: 4ec65756 -s ours am: 268fc62b -s ours