Merge "Support for dynamic shortcuts." into arc-apps
am: 50bf584715

Change-Id: I5bac745713be9e488d0d5121bdd2451641c697b3