Merge "Remove hidden Bluetooth dependencies"