Add timer to turn off location updates
Merge branch 'add-location-timer'