Prevent multi-modifier keystrokes from being enqueued

Signed-off-by: Nathan Sobo <nathan@github.com>
2.2.2
Merge branch 'master' into fix-for-international-layouts