Merge "Handle logd reconnect." into pi-dev