* Ensure selected entity is pre-selected in homekit options flow
- We recently adjusted the flow to exclude entities that had
been deleted from breaking the UI validation. We need to include
single entities in the set of all supported entities since
accessory mode has no domain filter
* tweak
* Additional fixes
* small tweak to speed up building the set
* merged fixed version for test branch
9dd09f66e2