Merge "Nfc: Rename system properties in Nfc settings"