Merge "Catch ActivityNotFoundExceptions"