Merge "Changed PreferenceCategory left padding."