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

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

Change-Id: Iec4c4cbaaac8f622e9cfd2380a2f19bd1aeb1172