Merge "Avoid using KeyedVector in KeyLayoutMap"