Merge "Preference headers layout has been fixed"