Line spacing regression in preferences panel

[jkup]

• Submitted a ticket for my issue if one did not already exist.
• Used Github auto-closing keywords in the commit message.
• Added/updated tests for this change (for new code or code which already has tests).
• Ran git rebase -i to squash commits (if needed).

Fix #4100

Test Plan:

@bradleyrichter can you check all the preferences panels in this branch and make sure they are looking good to you?

[bbondy]

++