Bug 988313 - Additional fixes for keybinding test (v3-v4 interdiff).