[Bug]: Edited account names are not persisted after upgrade, names are changed

Describe the bug

After upgrading to 7.24.1 one of my accounts has been renamed incorrectly...

- Device was powered off, no recent activity with the app on device
- v7.21.0 build 1317 prior to upgrading I have my second wallet account called "Second" which is the same that defaults to "Account 2" when created but I had changed it's account name
- After upgrading to v7.24.1 my account "Second" is now called "Account 3"
- Account list is not sorted like prior releases, we should maintain sorting which was from top-down wallet accounts, hw accounts, imported account

My wallet setup for testing upgrades and ensuring the wallet setup persist is...

2 wallet accounts
- 1 account with name changed
2 imported account
- 1 imported account with ENS
2 HW accounts
- 1 Ledger
- 1 Keystone

Expected behavior

All account names, default or edited, should persist after upgrading mobile app.

Screenshots/Recordings

iOS https://github.com/MetaMask/metamask-mobile/assets/6626407/4fb7bf90-a610-4788-9883-8c72b6ada290

https://github.com/MetaMask/metamask-mobile/assets/6626407/1694a350-eac8-402e-bfdf-e881e173bd93

Android https://drive.google.com/file/d/1FK3oBxX8pA1FqWum6Yr6QaIb-YIi4Erc/view?usp=drive_link

https://github.com/MetaMask/metamask-mobile/assets/6626407/ed93e7f5-e144-4b67-8256-f04991ef5dfb

Not able to reproduce when upgrading with only one type of HW account. https://github.com/MetaMask/metamask-mobile/assets/6626407/ee50f075-83f5-46cd-a798-8f4f8ecf1081

Steps to reproduce

My wallet setup for testing upgrades and ensuring the wallet setup persist is...

2 wallet accounts
- 1 account with name changed
2 imported account
- 1 imported account with ENS
2 HW accounts
- 1 ledger
- 1 Keystone

All account names, default or edited, should persist after upgrading mobile app.

Error messages or log output

No response

Version

7.24.1

Build type

None

Device

Any

Operating system

iOS, Android

Additional context

Discussion here.

Severity