Merge "Fix regression when editing contacts" into jb-dev