Merge "CSD: Fix condition when dropping HAL BT CSD vals" into main