Merge "Move LayoutPreference into SettingsLib"