Merge "Refactor BluetoothRouteProvider"