Merge "Make sure an isolated removeTask becomes ready" into 24D1-dev