Merge "Throw ActivityNotFoundException when failed to launch shortcut" into nyc-mr1-dev