Merge "Merge Tap & Pay settings entries with NFC"