Merge "Launcher shortcut callback should deliver manifest shortcuts too" into nyc-mr1-dev