Merge "Add indexing for Storage preferences"