Merge "KeySetManager: iterate over correct list"