Merge "Guard against null BluetoothDevice extras." into sc-dev