Merge "Use feature flag to show/hide AllInOneTetherSettings"