Merge "Removed vertical padding in PreferenceActivity header list on phones"