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

Change-Id: Ibc270d83d7c8544195ce1f6e9eee245db7e095f5