Merge "Only start tether when not already enabled" into pi-dev