Merge "Handle NPE from BluetoothRouteProvider"