Merge "Modify the user default for "geotz enabled""