Ported unmerged precedent work on AddAccountActivity