Merge "Ignore ASHA hisyncId grouping if the device supports CSIP" into main