Improve shortcut demo

Bug 27548047

Change-Id: Iba717ec910e1fd48e623f5dea4604fc27e5d2818
12 files changed