Merge "Revert onNetworkActive callback behavior on U+" into main