Merge "Remove the NFC_DEP count from NumDiscNtf" into rvc-dev