Merge pull request #1289 from cascheberg/fix

@cascheberg Manually stopping while paused restarts on move / Deactivate location listener on map properly