Merge "Support editable 3p accounts without nicknames" into lmp-mr1-dev