Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev