Merge "Resolve separate binding for BT ICS." into main