Merge "Retry if interrupted before mMessageThread has joined"