Merge "Fix 3374446: Allow multiple shift keys in Keyboard." into honeycomb