Merge changes from topic "am-bc5a207207444d879b47702dc56ec1ea" into main

* changes:
  [automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: 6f2bb120 -s ours am: 9483dde5 -s ours am: 4c324b79 -s ours am: 29917925 -s ours am: b0153bc8 -s ours am: b29d4a7d -s ours am: 218713d1 -s ours
  [automerger skipped] Fix settings activity showing background bp when am: e1c25c18 -s ours am: 45d2b0b2 -s ours am: 843ad522 -s ours am: 4ca4ae71 -s ours am: 4400e0d8 -s ours am: e69e8f8e -s ours am: 61ac3b6f -s ours