Merge "Add dynamic Preferences indexing"