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

Change-Id: Ifa38fe77fcf6d586ea85782665a3d6d01db19853