Merge "Improve the shortcut manager sample launcher." into nyc-mr1-dev