Merge \"Launcher shortcut callback should deliver manifest shortcuts too\" into nyc-mr1-dev
am: 901c03faba

Change-Id: Iaccb15163fd5b795adced796ede0a56e30a544a3