Merge changes from topic "am-c40b1185c7324a2dbd29523c2c7c5591" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Defer remove splash screen while device is locked" into tm-dev am: eaf6e716 am: 86dd3d96 am: 07700203 -s ours am: b9a87a9c -s ours am: ec2e2fe6 -s ours am: fb23162c -s ours
  [automerger skipped] RESTRICT AUTOMERGE Defer remove splash screen while device is locked am: 99563107 am: 6b037b42 am: 44d2ee07 -s ours am: 6c60f2f4 -s ours am: e7d568ea -s ours am: 4d094286 -s ours