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

* commit '5bf5b1762a31192d4dee513a46d7864327b65422':
  Using Intent display name to create shortcut

Change-Id: I5c691410dd8a883477a1cd88cc6168808179a898