Merge \"Making adding account dialogs up to spec (2/2)\" into ub-contactsdialer-f-dev
am: 39e0e13be6

Change-Id: I6347fdbaee8a3cb3633a8cd92eba04958f70a8aa