Close takeUntil observable streams sooner

The previous implementation necessited one more value to close the
observable. It meant that the GPS could be turned on while we just got
an acceptable value from the network provider.
Work on #4410