Merge "[Catalyst] Add tag contracts for device state" into main