Merge "Move Indexable to SettingsLib"