Merge "Deprecate AppListPreference and AppListPrefWithSettings"