LPS-38309 we remove the displayStyle in more situations than needed