am a6095969: Preventing NullPointerException when cancelling a shortcut addition

* commit 'a6095969bb5938ad95ee9f858970d5eb54eb124d':
  Preventing NullPointerException when cancelling a shortcut addition