am f677c098: am 70bb3f3d: am bc7391d8: resolved conflicts for 93db3d4b to cw-e-dev

* commit 'f677c098c10ee473e45d31bf5042cc38024a4f8a':
  Retry if interrupted before mMessageThread has joined