Name change - reverts back to default screen

[Terence-D]

Updating the name on my Fire7 tablet caused the changes to be undone. To replicate:

1. Start with SC 7 screen
2. Make some changes
3. Save them
4. Return to main
5. Reopen SC 7
6. confirm changes exist
7. Close SC 7
8. Update name
9. Reopen SC 7
10. Confirm changes are gone :(