Merge "BluetoothDialog view fixed for no pair code case"