Merge "Add Launcher shortcuts." into nyc-andromeda-dev