Merge "Move AppPreference to settingslib, and change imports."