Merge "Add setting for default account (2/2)."