Merge "Replace KeyedVector with unordered_map in dispatcher"