Avoid dispatch in the middle of location action dispatch
Merge branch 'fix-location-dispatch' into stampsy