bad redrawing upon switching layouts

On r1a4 (and hrev45107), I noticed some drawing issues in Keymap. Switching between layouts may not reliably trigger redrawing, resulting in the newly selected layout to be overlayed on top of the previously selected layout.