Persist the "Upload only on wifi" preference
Always do as the user requested with respect to the Geofence Enabled switch

Previously, it would only turn off in a very specific circumstance.  After
this change, it should always set the geofence enabled to what the user selected.
Merge pull request #680 from keverets/wifi-only-persist

Persist the "Upload only on WiFi" and the "Geofencing" preference