Merge "Handle all stage root tasks dismissed for flex split" into main