Merge "DSDA: Drop HELD with ACTIVE + RINGING nonholdable" into main