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

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