Merge "Change Preferences padding to match UI spec."