Merge "Use SettingsLib Indexable"