Merge "Don't attempt to stop the receive thread if we never started it." into mnc-dev