Merge \"Bringing import/export dialog and edit photo dialog up to spec (1/2)\" into ub-contactsdialer-f-dev
am: 65b084c823

Change-Id: I4cf548c4fa1f7a37328a5f85340db2f0593370a9