Merge "Add strings for revised settings page." into lmp-dev