Merge "Correct predictive condition about companion TaskFragment." into main