Merge "Use the NetworkCallback to determine the default network" into sc-dev