Merge "Add indexing for SwitchPreferences"