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

* commit '70bb3f3d43b4e41aa09f085de6dccc00e57e7218':
  Retry if interrupted before mMessageThread has joined