Merge "Fix KeyCharacterMap overlays by reloading base overlay before applying another overlay."