drivers/bluetooth: Merge s3ve3g changes