Merge "Improve the shortcut manager sample launcher." into nyc-mr1-dev
am: a8b1ed4475

* commit 'a8b1ed44753d82be0e2b387b1c02e16df1205165':
  Improve the shortcut manager sample launcher.

Change-Id: If364cfddb94ecc946bf895c4e2f3016886fe6c01