Merge "Update Tether Settings UI."