Merge pull request #14461 from colemanw/displayPrefsStyle