Merge "Correct predictive condition about companion TaskFragment." into 24D1-dev