Merge "Shortcut launcher demo:" into nyc-mr1-dev am: 6d48ba4dd4
am: 911969420a

Change-Id: I02fa81f11361621dafe1d856a7752b9e74255750