Sync with urwid.display_common, som code style fixes
Merge branch 'master' into external-ulib