Merge "Improve shortcut demo" into nyc-dev