Merge changes from topic "am-38513424cba24e66a9eeca4bb168dba6" into main

* changes:
  [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768c -s ours am: 29ddd832 -s ours am: 4cd1d533 -s ours am: f95ef389 -s ours am: 2370478b -s ours am: 4068e9ab -s ours am: 3bc17022 -s ours
  [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992 -s ours am: 68af1ce6 -s ours am: 9e5e6c87 -s ours am: 0f7ac7b8 -s ours am: e09ac267 -s ours am: 84185433 -s ours am: 265b4744 -s ours