Merge "Un-deprecate some NFC methods" into main