Merge "Use SettingsLib's LayoutPreference"