Merge "Bluetooth: KW issue fix"