Merge "Add indexing for ListPreferences"