Include drawGPS variable in the options swap.

When switching moving mode the drawGPS value is now included in the swap which corresponds to the behavior of the other options. Previously the drawGPS value was retained when switching mode.