Merge "Change PreferenceCategory margins."