Correctly combine or filters in combine-props.

Closes PR 14534.