Merge "Retry if interrupted before mMessageThread has joined"

            nContextDeinitToClient(mContext);

            mMessageThread.mRun = false;

            // Wait for mMessageThread to join.  Try in a loop, in case this thread gets interrupted

            // during the wait.

            boolean hasJoined = false;

            while (!hasJoined) {

                try {

                    mMessageThread.join();

                    hasJoined = true;

                } catch(InterruptedException e) {

                }

            }

            nContextDestroy();