Merge changes from topic "am-31e0878aa41a41bf986f1bb50879ab1c" into main

* changes:
  [automerger skipped] Merge changes I7c63d523,Id0ac7d06 into udc-dev am: 132292ab am: 6e2ccc18 -s ours
  [automerger skipped] Fix bug in screen capture and lock task migrations am: 9d809f92 am: fdab86e2 -s ours