Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev