Merge "Add new system service "shortcut"." into nyc-dev