Add Any and All selection for label search in all contacts page
Fix conflicts after merging MH-555 to dev