Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"