am 36923016: Merge "Fix regression when editing contacts" into jb-dev

* commit '36923016e40df2d252c600ad13a2b35ec14f29af':
  Fix regression when editing contacts