Merge "Fix crash when viewing or editing contacts without account" into oc-dev