Merge "Revert "Fix DisplayState sanitization."" into main