am ea49c1c8: Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1

* commit 'ea49c1c8610ad7eb0367d073a410e989c8998160':
  Prevent the creation of Shorcuts with null intents (issue 5629292)