Merge "Adding per-app default network callbacks support"