Merge "Catch ActivityNotFoundException in Recents" into klp-dev