Merge changes from topic "am-61eefbf428574c71bcdddd94c26324d5" into main

* changes:
  [automerger skipped] Merge "Make sure an isolated removeTask becomes ready" into 24D1-dev am: ace5941e7a -s ours
  [automerger skipped] Make sure an isolated removeTask becomes ready am: 60386b822b -s ours