Merge changes from topic "am-d8b191b5b56e48e78ffe3bcb86b8c5f4" into udc-dev

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d6670385 am: 86138c26 -s ours am: 7de60a54 -s ours am: 3b7929f2 -s ours am: ce6f1842 -s ours am: e124c0cf -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6b am: ef00451c -s ours am: 42815bea -s ours am: 56583f05 -s ours am: 7f71ff7d -s ours am: 479e2a53 -s ours