Merge "Revise strings for the NFC developer option"