Merge "Change margins and font size for preference_child style. Missed in previous checkin."