Merge "Persist the line 1 number and simplified network settings page." into lmp-dev