Merge "Fix typo when ActivityNotFoundException occurs"