Settings and WWan cleanups
These were previously part of !1428 (merged) but as we're redoing both !1428 (merged) and !1379 let's split those out so we can merge this early (so we don't conflict with any of the two). @arun-mani-j had already acked the Wi-Fi bits.