Merge "Refine NFC settings UX"