Merge "Fix crash adding an account." into nyc-dev