Merge "logd: better drop message merging"