Merge "[ConfigStore] Clarify hasHDRDisplay spec."