Merge "Move data loading and account creation to edit contact base class"