Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev