Merge "Catch ActivityNotFoundExceptions" into klp-dev