Merge "Change the behavior of notifyAllowedNetworkTypesChanged." into sc-dev