Merge "Move AppPreference to SettingsLib so other apps can use it."