Merge "BluetoothGattCallbackExt removal"