Merge "Using Intent display name to create shortcut" into nyc-dev am: 5bf5b17
am: 40ffd4a

* commit '40ffd4a60dafc600647fc6acdaedaffcd460cdf3':
  Using Intent display name to create shortcut

Change-Id: Ifa91ad4928576bbd9cd59d6de7e5297ec9a995a1