Import PreferencesWidget spacing fixes from master.