Merge "nfc(api): Prepare for NFC codebase move" into main