Merge change 23643 into eclair

* changes:
  Don't crash when a user taps on a fast track trigger that isn't hooked up to a contact.