Merge "Attribute UNKNOWN display state to OFF"