Merge "nfc: Prepare for NFC codebase move" into main