am 19e4d9db: Merge "Preventing NullPointerException when cancelling a shortcut addition" into ub-launcher3-burnaby

* commit '19e4d9db28ee6487428879aacd053c319771b51c':
  Preventing NullPointerException when cancelling a shortcut addition