Merge "Make sure an isolated removeTask becomes ready" into main