Add changes lost in I467a8b4fa5cc610c3e1627f30631a55ecd6c91c1

This allows contacts to be created in a null device account without showing the
account chooser. It also shows the correct title in the action bar when viewing
device accounts.

Change-Id: I3ee096d1ed70d544fd719e930dcb49953c162eb3