am a62a1926: am 471252b9: Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev

* commit 'a62a192680c54c6c9152a5ebd448237c0fde171a':
  Fix a bug in multiple shortcut handling code.