Merge "Fix crash editing newly saved directory contact" into lmp-dev