am 81f74c7d: am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

* commit '81f74c7d427f2942cdccae30329694e9825f5d8f':
  Catch ActivityNotFoundException in quick contacts badge