Merge "Add a feature flag for the new tether settings UI"