Adds option to disable dnd contact merging.
Fixes possible NPE, making some contacts to disappear from contactlist.
Commit from translate.jitsi.org by user acastroy.: 1228 of 1228 messages translated (0 fuzzy).