Merge "sounds_index: Avoid repeatedly reindexing."