Merge branch 'display_preferences' into 'dev'

Add spaces where needed.

See merge request !469
1 job for dev in 3 minutes and 13 seconds (queued for 1 second)
Status Job ID Name Coverage
  Lint
passed #2538
lint

00:03:13