Merge branch 'settings_layout_fix' of https://github.com/lukeswitz/haven into lukeswitz-settings_layout_fix

Author: n8fr8

src/main/res/values/styles.xml

@@ -20,7 +20,6 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:textColorPrimary">@color/primary_text</item>
         <item name="android:textColorSecondary">@color/secondary_text</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <!-- Style for an Preference Entry -->