Merge "Fixes Settings app crashing when NfcAdapter is null"