Merge "Move closing task removal to onTaskVanished" into main