Merge "Find and remove visible task onTaskVanished." into main