Merge "Fix problem of logd restarting." into main