am f13586ea: am a6095969: Preventing NullPointerException when cancelling a shortcut addition

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