Merge "Added WiFi Assistant settings." into lmp-dev