RemoveStageBarrier: fix issue with empty shuffle blocks