Revert "Revert "gps: fixed singleshot session that doesn't stop""

This reverts commit c72ce7e3db33dd6b5c8dae9c21e150d62a8d4ecd.