Merge "Fix NPE in AppListPreference when there is no default."