Merge "Fix USB tether option" into sc-dev