Merge "Fix the multiple instences of NetworkProviderSettingsActivity issue" into sc-dev