Merge "Preference headers layout has been fixed" am: 9171c25f7d am: 7e8ff2694e
am: 1de9fa3bed

Change-Id: I55feb81966eb81ab4787dd9e165c91cbe52d90ec