Merge "Move config_apf* resources to NetworkStack" into sc-dev