Merge "Move Bluetooth battery stats tracking (2/2)"