[bc-gnso] Reconsideration of Singular-Plural contention sets