Merge "Fix DisplayState sanitization." into main