Merge "EnabledNetworkModePreferenceController redo Init after sim activate" into sc-dev