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.