am 44a2f1a8: Reconcile with jb-release

* commit '44a2f1a857e2e4daac551ac03a6efa1ad92c2ea1':
  Crash on deleting messaging thread