Merge "Fix crash in WifiSettings." into lmp-dev