Merge "NfcTile: Update style to match current UI"