Merge "Bluetooth: Fix KW error" into bt.lnx.5.0