am 869228da: am 3c24aca5: Don\'t crash when adding a shortcut.

Merge commit '869228dadb0e537ce9138dc613c4cbc7e1aed1d3'

* commit '869228dadb0e537ce9138dc613c4cbc7e1aed1d3':
  Don't crash when adding a shortcut.