Merge "Correct stream type for BLE input device" into tm-dev