Merge "Using Intent display name to create shortcut" into nyc-dev